Code for previous change

diff --git a/src/xterm.c b/src/xterm.c
index 1136b67182236e051d30a4fa03a7d93eecb78c13..c7f56e1f1f21dfa09d5d72f6c7f223706c7b32a3 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7337,9 +7337,13 @@ x_bitmap_icon (struct frame *f, Lisp_Object file)
 
 #ifdef USE_GTK
 
-         if (xg_set_icon (f, xg_default_icon_file)
-             || xg_set_icon_from_xpm_data (f, gnu_xpm_bits))
-           return 0;
+         if (FRAME_DISPLAY_INFO (f)->icon_bitmap_id == -2
+              || xg_set_icon (f, xg_default_icon_file)
+              || xg_set_icon_from_xpm_data (f, gnu_xpm_bits))
+            {
+              FRAME_DISPLAY_INFO (f)->icon_bitmap_id = -2;
+              return 0;
+            }
 
 #elif defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)